From 87bf268b0df2f4980656f70aed2d1ba0b7ed4cd8 Mon Sep 17 00:00:00 2001 From: "awilliam@xenbuild.aw" Date: Wed, 4 Oct 2006 22:12:14 -0600 Subject: [PATCH] [IA64] Clean up extern declarations in arch/ia64/xen/domain.c Signed-off-by: Aron Griffis --- xen/arch/ia64/xen/domain.c | 10 +--------- xen/include/asm-ia64/linux-xen/asm/system.h | 1 + xen/include/asm-ia64/vmx.h | 1 + 3 files changed, 3 insertions(+), 9 deletions(-) diff --git a/xen/arch/ia64/xen/domain.c b/xen/arch/ia64/xen/domain.c index 9433affbe8..d489299768 100644 --- a/xen/arch/ia64/xen/domain.c +++ b/xen/arch/ia64/xen/domain.c @@ -59,13 +59,8 @@ extern unsigned long running_on_sim; extern char dom0_command_line[]; -/* FIXME: where these declarations should be there ? */ -extern void serial_input_init(void); +/* forward declaration */ static void init_switch_stack(struct vcpu *v); -extern void vmx_do_launch(struct vcpu *); - -/* this belongs in include/asm, but there doesn't seem to be a suitable place */ -extern struct vcpu *ia64_switch_to (struct vcpu *next_task); /* Address of vpsr.i (in fact evtchn_upcall_mask) of current vcpu. This is a Xen virtual address. */ @@ -1103,9 +1098,6 @@ int construct_dom0(struct domain *d, physdev_init_dom0(d); - // FIXME: Hack for keyboard input - //serial_input_init(); - return 0; } diff --git a/xen/include/asm-ia64/linux-xen/asm/system.h b/xen/include/asm-ia64/linux-xen/asm/system.h index c12beafd3a..9f98e2a743 100644 --- a/xen/include/asm-ia64/linux-xen/asm/system.h +++ b/xen/include/asm-ia64/linux-xen/asm/system.h @@ -189,6 +189,7 @@ do { \ #ifdef XEN #define local_irq_is_enabled() (!irqs_disabled()) +extern struct vcpu *ia64_switch_to(struct vcpu *next_task); #else #ifdef __KERNEL__ diff --git a/xen/include/asm-ia64/vmx.h b/xen/include/asm-ia64/vmx.h index b9d9a67779..577fc1e34d 100644 --- a/xen/include/asm-ia64/vmx.h +++ b/xen/include/asm-ia64/vmx.h @@ -35,6 +35,7 @@ extern void vmx_final_setup_guest(struct vcpu *v); extern void vmx_save_state(struct vcpu *v); extern void vmx_load_state(struct vcpu *v); extern void vmx_setup_platform(struct domain *d); +extern void vmx_do_launch(struct vcpu *v); extern void vmx_io_assist(struct vcpu *v); extern int ia64_hypercall (struct pt_regs *regs); extern void vmx_save_state(struct vcpu *v); -- 2.30.2